From: Christian Lachner Date: Wed, 23 Oct 2019 12:48:09 +0000 (+0200) Subject: haproxy: Update HAProxy to v2.0.8 X-Git-Url: http://git.openwrt.org/%22https:/collectd.org/%22http:/www.crowdsec.net//%22https%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22https%22?a=commitdiff_plain;h=38a4100d04de7fc8c2ec748d072a0d3bad3836c4;p=feed%2Fpackages.git haproxy: Update HAProxy to v2.0.8 - Update haproxy download URL and hash Signed-off-by: Christian Lachner --- diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index f841ec263f..29adcbcddb 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.0.7 +PKG_VERSION:=2.0.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.0/src -PKG_HASH:=3873cd72028ed1bd2506dd174e01a92620e92683092f34234c96e067dcb113dc +PKG_HASH:=c37e1e8515ad6f9781a0ac336ca88787f3bb52252fb2bdad9919ba16323c280a PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index 8ef123d21c..f15aef24c1 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.0.git -BASE_TAG=v2.0.7 +BASE_TAG=v2.0.8 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/net/haproxy/patches/000-BUG-MINOR-stats-Add-a-missing-break-in-a-switch-statement.patch b/net/haproxy/patches/000-BUG-MINOR-stats-Add-a-missing-break-in-a-switch-statement.patch deleted file mode 100644 index 07874ddd60..0000000000 --- a/net/haproxy/patches/000-BUG-MINOR-stats-Add-a-missing-break-in-a-switch-statement.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit c0104fc33ccf7e843efd37cc033e4c3849a37844 -Author: Christopher Faulet -Date: Sat Sep 28 10:37:31 2019 +0200 - - BUG/MINOR: stats: Add a missing break in a switch statement - - A break is missing in the switch statement in the function - stats_emit_json_data_field(). This bug was introduced in the commit 88a0db28a - ("MINOR: stats: Add the support of float fields in stats"). - - This patch fixes the issue #302 and #303. It must be backported to 2.0. - - (cherry picked from commit 52c91bb72ccf20e75f2f79da6ebe345cb2a768f4) - Signed-off-by: Christopher Faulet - -diff --git a/src/stats.c b/src/stats.c -index 5819f459..9ec5066f 100644 ---- a/src/stats.c -+++ b/src/stats.c -@@ -399,6 +399,7 @@ int stats_emit_json_data_field(struct buffer *out, const struct field *f) - type = "\"u64\""; - snprintf(buf, sizeof(buf), "%llu", - (unsigned long long) f->u.u64); -+ break; - case FF_FLT: type = "\"flt\""; - snprintf(buf, sizeof(buf), "%f", f->u.flt); - break; diff --git a/net/haproxy/patches/000-OPENWRT-add-uclibc-support.patch b/net/haproxy/patches/000-OPENWRT-add-uclibc-support.patch new file mode 100644 index 0000000000..275702522b --- /dev/null +++ b/net/haproxy/patches/000-OPENWRT-add-uclibc-support.patch @@ -0,0 +1,18 @@ +--- a/Makefile ++++ b/Makefile +@@ -327,6 +327,15 @@ ifeq ($(TARGET),linux-glibc) + USE_GETADDRINFO) + endif + ++# For linux >= 2.6.28 and uclibc ++ifeq ($(TARGET),linux-uclibc) ++ set_target_defaults = $(call default_opts, \ ++ USE_POLL USE_TPROXY USE_DL USE_RT USE_NETFILTER \ ++ USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \ ++ USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \ ++ USE_GETADDRINFO) ++endif ++ + # Solaris 8 and above + ifeq ($(TARGET),solaris) + # We also enable getaddrinfo() which works since solaris 8. diff --git a/net/haproxy/patches/001-OPENWRT-add-uclibc-support.patch b/net/haproxy/patches/001-OPENWRT-add-uclibc-support.patch deleted file mode 100644 index 275702522b..0000000000 --- a/net/haproxy/patches/001-OPENWRT-add-uclibc-support.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -327,6 +327,15 @@ ifeq ($(TARGET),linux-glibc) - USE_GETADDRINFO) - endif - -+# For linux >= 2.6.28 and uclibc -+ifeq ($(TARGET),linux-uclibc) -+ set_target_defaults = $(call default_opts, \ -+ USE_POLL USE_TPROXY USE_DL USE_RT USE_NETFILTER \ -+ USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \ -+ USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \ -+ USE_GETADDRINFO) -+endif -+ - # Solaris 8 and above - ifeq ($(TARGET),solaris) - # We also enable getaddrinfo() which works since solaris 8. diff --git a/net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch b/net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch new file mode 100644 index 0000000000..541077e238 --- /dev/null +++ b/net/haproxy/patches/001-OPENWRT-openssl-deprecated.patch @@ -0,0 +1,12 @@ +--- a/include/common/openssl-compat.h ++++ b/include/common/openssl-compat.h +@@ -217,7 +217,8 @@ static inline int EVP_PKEY_base_id(EVP_PKEY *pkey) + #define TLSEXT_signature_ecdsa 3 + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) + #define X509_getm_notBefore X509_get_notBefore + #define X509_getm_notAfter X509_get_notAfter + #endif diff --git a/net/haproxy/patches/002-OPENWRT-openssl-deprecated.patch b/net/haproxy/patches/002-OPENWRT-openssl-deprecated.patch deleted file mode 100644 index 541077e238..0000000000 --- a/net/haproxy/patches/002-OPENWRT-openssl-deprecated.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/include/common/openssl-compat.h -+++ b/include/common/openssl-compat.h -@@ -217,7 +217,8 @@ static inline int EVP_PKEY_base_id(EVP_PKEY *pkey) - #define TLSEXT_signature_ecdsa 3 - #endif - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x20700000L)) - #define X509_getm_notBefore X509_get_notBefore - #define X509_getm_notAfter X509_get_notAfter - #endif